Merge changes Ib80f814f,Ic605e489 am: 3ef74f3cab

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I94fd187e5f2cc0428807668f82b3a29ad8b66c47
tree: bc36ff54677a7aa732779d522f13cbce9624beb9
  1. framework/
  2. service/
  3. OWNERS