Merge changes Ib5bcfb6a,I46c2a472,If0c75774,Iab7ba8d3 am: b56960bc76 am: d75803d52b

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

Change-Id: I3d51861d4baf3815caa3027c400a846f7f99a272