Merge changes from topic "am-208ccb4d2c5f4da6ac3d16c684d6bdf5" am: e515bedd

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1138076



Change-Id: I11d16318831cbf78ea220592cf1529654496d503
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>