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

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

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