Merge changes Ic5a3e169,I76daa3ab am: 8ca385688d am: 88f10e63bb am: bb86b5e45e

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

Change-Id: If54ea6526d4426e6e52eec40c72f3ddd625842fe