Merge changes from topic "am-ee5a2a9ae5ab402c9cc44537e62a1611" am: dcf6d12c -s ours

am skip reason: Merged-In I840068aa1ba5ea3b19b855347d45221875b773e9 with SHA-1 4d21ce0d is already in history

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



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