Merge changes I24580ea4,Id48b8eab am: 07a238ab02 am: e4f241500c

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

Change-Id: I8a7973e7ed4a8aac67d6f3da7c496a2eb0e28d92