Merge changes I3826b9ef,I91d68ca3 am: 364ad64fa7

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

Change-Id: Iec425473511a1fe1f4b2bcf633e56ae1c76102c0
tree: 67e60384ae731ccf2b33664fa6d41043cb8fb264
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING