Merge changes Ic5a3e169,I76daa3ab am: 8ca385688d

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

Change-Id: Ibc9ad6c89e1214302b92118a01a924fa1481767e