Merge changes I4753cae7,Ic6554d9b am: d752b7b746 am: 4a14072d74 am: 11e76f17a2 am: e221b4b21f

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

Change-Id: I5090eb2aaa01047bdf63e949073ce21fbc77df6d