Merge "add the AV1 in the VideoCodingMapEntry" am: 5c031de662 am: 5786209cbb
am: f2ecaba1f4

Change-Id: Id91d8bdd5c2e31bdc1a8dfc587e1f44f0797496b