[automerger skipped] Merge SP1A.210812.016 am: d388fa6ead -s ours am: 45c57b5818 -s ours am: b8dcfa7109 -s ours

am skip reason: Merged-In I4df863e8a1f9dac704f48677739b822c9d7b5052 with SHA-1 d31c61c202 is already in history

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

Change-Id: If023db5ee320d5dd8225a791b100d70ab03381a4
tree: 8a341bc9633a078bd01b5d1f27b5ad723b5e5925
  1. camera2/
  2. common/
  3. framesequence/
  4. photoviewer/
  5. widget/
  6. CleanSpec.mk
  7. OWNERS