Merge changes I713bc2ec,Ib9ab07c9 am: 6fe4b878e5 am: db887739f9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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