Merge changes I1b3a4173,I1200c9fd into sc-v2-dev am: 8b7d53bc1b am: 48d444cb06

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

Change-Id: I4a4e4b634c984660b8af742e60f0823e409c2a39