Merge changes Ia68f482a,I4911e214,Ied379654,I66d18512,Ie8e1bd63 am: 6e423b8024 am: f390bd61d7

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I91816c01a799a89b89098a6e9ff256dae7d31dbf
tree: 1829860251f0e191b3c9f7ce7b30e0534aec5367
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS