[automerger skipped] Merge Android U (ab/10368041) am: 5a1dae4074 -s ours am: aed6935be2 -s ours am: d2dfd7ca17 -s ours

am skip reason: Merged-In Ib8dce559d57564f6383c43bd1c9e2efedda7d92c with SHA-1 fe4c297054 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Media/+/24181980

Change-Id: I512a32fa1f53260a02dde3d905249e36dd0847ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 046b01885828a2f29163936644cf82a058d29472
  1. apex/