Merge "DO NOT MERGE - Merge ab/7272582" am: 9e036eca15

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

Change-Id: I4ce359f1ee6e8e41bdaf2f3c0199d72d2568ae0b