[automerger skipped] resolve merge conflicts of...

[automerger skipped] resolve merge conflicts of 540b50bb to qt-qpr1-dev am: 8750762c -s ours am: ebde0f1f -s ours am: fd06cdb5 -s ours

am skip reason: Change-Id I9b8786a321b1ba79d81b74c3041589f30df8e9c8 with SHA-1 a9533225 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I62a5d1f133ad7fe224d2a173935aa2ebc1180070