Merge branch 'upstream-master'

Bug: 167721530
Test: atest android.mediav2.cts
Test: run vts -m VtsHalMediaC2V1_0TargetAudioDecTest
Test: run vts -m VtsHalMediaC2V1_0TargetAudioEncTest

Change-Id: Id6900a9d5084fb6ae840f44a2b9133f95e1b96bc