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

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

Change-Id: Ib42d396ec58b190e46074c09e8e073f6be01396d