Merge changes Id53a8305,Ie74822a6 am: 33f7bff2ea am: 15805a44cd am: 8c4cdcdccf am: 1cca6cd6cb

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

Change-Id: I5c1fa05438b15cba4890a3dcb08ab2e44e5956cf