[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: bd0809dbb4 -s ours am: f8e50fc589 am: 7991ce24c2
am: a389444797 -s ours
am skip reason: subject contains skip directive

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