[automerger skipped] Merge changes Ib5ac6ee9,Ib127ad43,I37a423f3 into sc-qpr1-dev am: 1902c78ce2 am: 0c8f40b27c -s ours
am skip reason: Merged-In Ib5ac6ee909e666b66b41fd0069f6c9528858dd37 with SHA-1 51b6659ae1 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15542636
Change-Id: I5e97959a4acfebf522ff937a95c1ea5ffc8db5ef
This commit is contained in: