Backporting the change of ag/15629060 to pi-dev am: 95ff59db3b am: e317818b24 am: 8f758cff77 am: 30d1571a99 am: 5b9145dd18 am: f155d65dba

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15748731

Change-Id: I021428f5e7ee50c4a1c97baeee147886ca2776e0