Merge changes from topic "am-d69fcd1105f34e8086bb22773f6f1fa1" am: 3a2079dc

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



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