Merge changes If51b6676,Ia6863a70,I802d2316 am: 76851bd64d am: 4740b85389 am: 674f420dd2

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

Change-Id: I4007a4e3cec0e589fb0a82021d73d10f922539d3