Merge changes from topic "rm_changes" into main am: 99a096a992

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

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