Backporting the change of ag/15629060 to pi-dev am: 95ff59db3b am: e317818b24 am: 8f758cff77 am: 30d1571a99 am: be868a5a7f am: f80f8feda8 am: 59a0d185e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15748731 Change-Id: I53cf7147e3a5f2233df2834251c5b17b6fa2a97b
This commit is contained in: