[automerger skipped] Merge changes Ib5ac6ee9,Ib127ad43,I37a423f3 into sc-qpr1-dev am: 1902c78ce2 -s ours am: 0fd6b2ca4c -s ours
am skip reason: skipped by user zoeychen Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15542636 Change-Id: Icac9a1cb8e3313988bc4a48122a194ffe0b33e11
This commit is contained in: