DO NOT MERGE - Merge ab/7272582 am: 81ee8500b9

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

Change-Id: Id831173a5bad0c7c42c7d89916cd671aa51cb300