Merge changes If663677b,I387d90ea am: ea4a93a946 am: da769ac79d am: 574db828e3

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

Change-Id: I261fe4c6a0d926486052fdd2a812f709c419f78f