Merge changes Ib80f814f,Ic605e489 am: 3bde652e41

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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