Merge changes from topic "bug_204349132" am: dbb28516e8 am: 9e1b274680 am: 91d6da628f

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

Change-Id: Ie9a7a5f56d2cb96bc2e0a6e31df321e814b3c289