[automerger skipped] Backporting the change of ag/15629060 to pi-dev am: 95ff59db3b am: e317818b24 am: 8f758cff77 am: 30d1571a99 am: be868a5a7f am: f80f8feda8 am: 7596350957 -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/+/15748731
Change-Id: I878c822a03bcc6f3f277c4dd41f954603891a711
This commit is contained in: