Merge changes Icb507878,Ia55137f5 into main am: 14bedf1401 am: 0198a8e82d

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

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