Merge changes I713bc2ec,Ib9ab07c9 am: 6fe4b878e5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I27116d11a4a61c2ca76f687d8d47a4a973ae1e77
tree: c957f1774def870365515531fd056bae8d14e7b8
  1. core/
  2. services/