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

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

Change-Id: I7274a1bf200eb9bcd38dd949bc34961a13aa0a0b