Merge changes from topic "rm_refactor_last_batch" into main am: e9e62c53 am:...

Merge changes from topic "rm_refactor_last_batch" into main am: e9e62c53 am: 5a072fc1 am: 5a3a8821

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



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