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

Change-Id: I294561a8a5b72dd4fbc65bdf952a920730761edf