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

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

Change-Id: Ic0722a1788d549d263a2052bcad8a39593a026e6