[automerger skipped] resolve merge conflicts of...

[automerger skipped] resolve merge conflicts of 8e6e52ec to rvc-qpr-dev-plus-aosp am: dc1367d4 -s ours

am skip reason: Change-Id I2bd1fa5bac6b35096b3059f93d68ef24b7a464e5 with SHA-1 022aac54 is in history

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

Change-Id: I7d96faf8be2892cac8153bec7111df9339153d39