Merge changes I6a51d803,I162fae5c am: b524e17519

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

Change-Id: I1ed98a5295891da0eef007960e4260dfd047de2b