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

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

Change-Id: I61cdda413fe21a46ac075a0abba2b9affa015149