Merge changes Ie0b32460,I21028457,I82754375 am: 29e5346c24 am: 59e069bbde am: 95dbc7e04a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e28cde0569c263c6afe5ad722be4060912eae0e
tree: 90754a0c30d4707393bfa7c59cbfec438ccdb4e2
  1. core/
  2. services/
  3. tests/
  4. OWNERS