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

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

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



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