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

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

Change-Id: I5249836f51e7332b0e5db17f7695733e921b2652