[automerger skipped] Merge Android U (ab/10368041) am: 824677fd59 -s ours am: c99ab4977e -s ours am: a8e08ed68c -s ours am: 075eed63ae -s ours

am skip reason: Merged-In I7dac45bdf2c5c00004f39a274f981c2c242c26a2 with SHA-1 036ec921b1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ex/+/24181573

Change-Id: I245c1ad67fb49c3cb3729a8527d54b64019dcd80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: da0417ebd1cd17c2ec214fb4e75bfb8c80d5b089
  1. camera2/
  2. common/
  3. framesequence/
  4. photoviewer/
  5. widget/
  6. CleanSpec.mk
  7. OWNERS