Merge changes I4ff28737,I8433c40a into sc-dev am: 9fee705b22

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

Change-Id: I7fe94a182537ac323c9beb8ce3b08f9f0629e977