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

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



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