Merge changes I1ea9dec1,I1dbffcbe am: e8bf0df312 am: fd270b8f0b am: 787d4c77c4

Original change: https://android-review.googlesource.com/c/platform/system/media/+/1371672

Change-Id: I9a94a8b15a7f6db6aa04bb7db62bcaebe5ee19de