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

[automerger skipped] Merge "resolve merge conflicts of 887f4fbc to rvc-qpr-dev-plus-aosp" into rvc-qpr-dev-plus-aosp am: f297e449 -s ours

am skip reason: Change-Id I843efb4880b6caaf3872e9b0918fd710fb93d979 with SHA-1 6cbaff24 is in history

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

Change-Id: I26b3acb49b3b07bd67cc921c811ddeea8964caaa