Merge changes from topic "am-86c0ae89e3c847c8a473d59d272871a3" am: 16575d71 -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: Iaf086b0376d9c1d971c3c513bc0633f67d0d56fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>