Merge changes Ia68f482a,I4911e214,Ied379654,I66d18512,Ie8e1bd63 am: d18e61a6d1 am: a7a858e42a am: ed9730e6f9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I698b6b082b121c004b2c8b05ef423da1bd8b871b
tree: 2a46f14224b7b869b2a1a90e287152c8959f0d1a
  1. framework/
  2. service/
  3. OWNERS