[automerger skipped] Merge changes...

[automerger skipped] Merge changes I566dfa75,Id0d372cf,Ifb79e402,Ic80ed7f8,I40ff3ed0 into sc-qpr1-dev am: e454d516 am: a49709f0 -s ours am: ae564a75 -s ours

am skip reason: Merged-In I566dfa7585ade8fcba53a6a98213776e156267bd with SHA-1 fb37824e is already in history

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

Change-Id: I00d3a4d019f85ac4549777bb8de131c2ff3ec905