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

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



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