Merge changes from topic "rm_refactor_stage2" into main am: 20d97e07 am:...

Merge changes from topic "rm_refactor_stage2" into main am: 20d97e07 am: 4bbf80e0 am: 61051858

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



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