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

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

Change-Id: I49cb16e2ae99687be9a4b72773901fa59b506138