Merge changes Ibf64db88,I033ee79c am: 689bba18b3

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

Change-Id: I5558464cf53cdbab4241706eb62c5fcc3a91afaf