Merge changes from topic "am-e4a6bb04d1754d4d9807a9904eecf5fd" am: d7c16f1f -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/+/2194957



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