[automerger skipped] Skip ab/6749736 in stage. am: 24212df131 -s ours am: ad9333ba6b -s ours am: 4f62ad8751 -s ours

am skip reason: Change-Id I4bb6cc7587460a4c9cd03a6cb68d38c4b900ab81 with SHA-1 b3a78e310f is in history

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

Change-Id: I3660112c4dbc0bf60b4dec863b0430c62fdd940f