Merge changes I4256ca5f,I91528e1a,I48bd594c am: cdb5fbfbc2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic761cd9e8e492bcbde117f2b7de7f995b93ea0e7
tree: b2801c0e254a0f268496380630fa31c7e43901bc
  1. framework/
  2. service/
  3. OWNERS