[automerger skipped] Merge changes Ib5ac6ee9,Ib127ad43,I37a423f3 into...

[automerger skipped] Merge changes Ib5ac6ee9,Ib127ad43,I37a423f3 into sc-qpr1-dev am: 1902c78c am: 0c8f40b2 -s ours am: 8c89f842 -s ours

am skip reason: Merged-In Ib5ac6ee909e666b66b41fd0069f6c9528858dd37 with SHA-1 51b6659a is already in history

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

Change-Id: I49d1c4ed73092275eda15c9e37f24dbd15976221