[automerger skipped] Merge changes I3826b9ef,I91d68ca3 am: 364ad64fa7 am: 41d68e4f4a am: 3b8caaa25f -s ours

am skip reason: skip tag Change-Id I3826b9efc3418a724bd3753b9ad573adc3343b72 with SHA-1 c9a448808b is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654008

Change-Id: I81c4e3062f7546bf08f662e47cdbca63dae4d8fb
tree: 86add4b601860634962f8ca93a5d8eb03180e656
  1. framework/
  2. service/
  3. services/
  4. tests/
  5. OWNERS
  6. TEST_MAPPING