Merge changes I0e6df469,I3d46d5f7 am: 05baf850c4 am: 263ead791b am: 8f5de657a6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I44e26cb8d6e8071c7467316bfb60047d1ea10a22
tree: 326944bd2497aa009a70c3171285c6b9ee6b4a12
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS