Merge changes I35ed84fc,Ie6cfd77b,I4e4f929f,I751526e8 am: 51d01615d3 am: 25d2ee9e66 am: de7ef4ab0b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I54ef9fd59388908f38721671dd26f536fab719bb
tree: 9c9b04d5d9ebe38aa227b4e5060e4a8189fd97b0
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS