Merge changes I852e3a53,I86755647,I0ed8b0c6 am: 0f35b07653

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0428b441b34d48157a28dfc0463976be135146f4
tree: 1f04595a2b6ee5e64d0e9c88bbf2183edc615135
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS