Merge changes from topic "b181830609-part2" into sc-dev am: 3612da74

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

Change-Id: Iac3300b109e32d5a65a7fceed5e29c968da30e2e