Merge changes Ib80f814f,Ic605e489 am: 3bde652e41 am: 3912538c41 am: 9038eeece3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I47862eeec4f74a0901b8b866dd6ffa906bd9e62f
tree: 337269213efbb6fd00f92a730b3d49419f31813b
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS