Merge changes Ia43ab0ab,I0c4b91aa am: 474d549f7c am: 38762c75d1 am: af1f784ee0

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

Change-Id: I0155ccab9da75bf5b5f34825a21003545219b512