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

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

Change-Id: I20b1ce8c3b7a5aebcfd0327703a62a38cb78c74f