Merge changes I335e82e2,I84ba363d,I8f18083b,I854a952d,I00e23441 am: bf97a3ab5e am: ba22df4f9d am: 2d82b40262

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

Change-Id: I5fa8e7b8bf35a5464868fdca4d115b3f9132c65f
tree: 7883f65849a51e8464477eafef437e256ab3b93d
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS