Merge changes I4b135749,If4fcaa52 am: 576dad46 am: cd4e6ae6 am: 5cdc27d2 am: be6088d1 am: eee5d160 am: 60103ee4

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

Change-Id: I29433be9b2acd3031384234a40f2cfd9cba3985e