Merge changes Ib80f814f,Ic605e489 am: 02929bde11 am: 39e98823a3 am: a7baeed6a6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I47862eeec4f74a0901b8b866dd6ffa906bd9e62f
tree: 16d59ed1478b4617e05bc178411a523d8604b90b
  1. core/
  2. services/