Merge changes I06ab0f2d,I8b146aa1 am: 22c42d573e am: cf985cf03e am: 24b2a334d0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I75c940363940f4c941cc7dc89452bed078396a7e
tree: cbebe6f034b08a5d851ba4392800667ec11ab379
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS