Merge changes Iefd5b12b,I6907880a am: b888b08ffe am: 27560823fc am: 0822a0161b

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

Change-Id: I75ee81be981ab5a3f251cf7c202c124606c56c12