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

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

Change-Id: If337e342c64b0867c8789a5fdfd7a33abb197515