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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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