[automerger skipped] Merge changes Ic2357dcf,Iddf8c71a am: 29ed3efbfe am: 6cece1f221 am: fa31b5bfe8 -s ours

am skip reason: skip tag Change-Id Ic2357dcfff3233e0dd17b48b0e376a5095ef60fa with SHA-1 5c3c52975a is already in history

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

Change-Id: Ib7ed1d9c595b30fadf6efee2ab2614197e156ce1
tree: 388bff3bf6d7f63adbeaf1f37c470003baf1479c
  1. framework/
  2. service/
  3. services/
  4. tests/
  5. OWNERS
  6. TEST_MAPPING