Merge changes Ibf64db88,I033ee79c am: 689bba18b3 am: 215b89a5c4

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

Change-Id: I629d4fa54a07f2600a0640b73abdcc8221710744