[automerger skipped] Merge changes from topic "am-76600349da4e4810be01a0dcf115747a" into rvc-qpr-dev-plus-aosp am: 84787d76ee -s ours
am skip reason: Change-Id Iac1cdd643253fd186a164b863d65d6e92698fd38 with SHA-1 02b4a387aa is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13554971
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic5f3c369a84617252b71c46c4be1ed5bfcd6047c
This commit is contained in: