[automerger skipped] Merge "Backporting the change of ag/15629060 to rvc-qpr-dev" into rvc-qpr-dev am: 9f4825bcd2 am: 58c145ca7a am: 260e0dfda0 am: 41803a382a -s ours am: 0d40558db5 -s ours
am skip reason: Merged-In I7e2f95fd85e18127dc481f188ace8ad6effc4831 with SHA-1 281777cf4c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15750142
Change-Id: Ie609ef6938861d27b651ab7573d379b144b0e86d
This commit is contained in: