Merge changes Ifc8ad902,I6d1b8d0e am: 87c6253518 am: 66b74e588b am: 913569d3e5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6f3235dd38e4c4912f986cbb27867ff14fe38e81
tree: 90e77e27553426ceb2beb8f9204aae67e83af517
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS