Merge changes from topic "bring-rm-uptodate" am: 0f6f28be am: affaf68f

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



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