Merge changes I713bc2ec,Ib9ab07c9 am: c5a7a59483 am: efeaa56ba6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I31e71444d5b40981058b5a4152e5f1a0521527d0
tree: bc640bf882a76766281d77b4debaa87821811de3
  1. core/
  2. service/
  3. services/
  4. tests/
  5. OWNERS