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

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

Change-Id: Ibb4cfb5be191efe6e6e821eb17d905fb96b02ebb