[automerger skipped] Merge changes Ib5ac6ee9,Ib127ad43,I37a423f3 into sc-qpr1-dev am: 1902c78c -s ours am: 0fd6b2ca -s ours am: 7d95ae6a -s ours

am skip reason: skipped by user zoeychen

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

Change-Id: I338e68fc986a00c0e858c04b232bec4ef25bbcf6