Merge changes Iac9487e8,Ifa411c7b am: 999506022f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2cf126259f903d407830b1e8bc2d3fcdc02b97c2
tree: 61d6cba1ebfbd0b3174ef441b25f8d03ec06be58
  1. framework/
  2. service/
  3. OWNERS