Merge changes Ic6e60752,I2b8b7e74 am: 70e7dd44b4

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

Change-Id: I6014b12fd060fae30ac28a429a69338cb3f56265