Merge changes I6a51d803,I162fae5c am: b524e17519 am: 18013cefe3 am: 84aa44d22b am: 676c21cf05

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

Change-Id: I40ff3cfcb4dbe7dc036eaa87df2fa192aee3f016