Merge changes Ia43ab0ab,I0c4b91aa am: 474d549f7c

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

Change-Id: Iaf1b2b66a8e396d7e0670ef6967347f6878c14ee