Merge changes Id389ff64,I51598ae1 am: 8c2ebfed4e am: b1453af1ab

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

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