[automerger skipped] Merge changes I61c32c74,I505c9b04,I5c19e6a8,I24e86a75...

[automerger skipped] Merge changes I61c32c74,I505c9b04,I5c19e6a8,I24e86a75 into sc-qpr1-dev am: 78569f94 -s ours am: 5190fc03 -s ours am: d69e2e3f -s ours

am skip reason: skipped by user zoeychen

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

Change-Id: Ic67d8cf57c07d6ee377f2b75a72c321d4d6999d9