Merge changes I69570002,Ic86454b5 into sc-dev am: ff60e613c0

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

Change-Id: I1f8db39fb17c42ddfddd1067ec7726dc96a6f85d