Merge changes Ifc8ad902,I6d1b8d0e am: 8d659bb1ec am: 3f0bf593ae am: 750dca50d3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6f3235dd38e4c4912f986cbb27867ff14fe38e81
tree: c9c7df3868f5517f1c5e5bb7e78b2d60616fd958
  1. core/
  2. services/