Merge changes from topic "am-5d1381569409445a95bc6ad3521c2cc4" am: bb22ff3b am: 61a3c431 am: 12c12bf2

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



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