Merge changes Ifc8ad902,I6d1b8d0e am: 87c6253518

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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