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