[automerger skipped] Merge "Resolve merge conflicts of...

[automerger skipped] Merge "Resolve merge conflicts of c2810b93 to sc-qpr1-dev-plus-aosp" into sc-qpr1-dev-plus-aosp am: 9589585f -s ours am: 636e9c03 -s ours

am skip reason: Merged-In Ibdff22eda7be6c91e2872e5ac3ae8f2fe1e65b69 with SHA-1 069c6b50 is already in history

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

Change-Id: I8f965d04998a8c58118d7535eae09f8b32a09e7a