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

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

Change-Id: I1c4f486278a022b439a10bc65e5971ec8684a6de