Merge changes Ic0719395,Id9f1b639,I00474797,Ide06476a am: 4fccd09896 am: 446dd2518b am: a686092d5e

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1698086

Change-Id: I1934157265623c9a3dc042034b2ef351720f284b