Merge changes Ib1c28c94,Id3485a2a,If5ad5acf,Idc9054bd,Ie4e7e25d am: 756621f54d am: aae80e18c3

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

Change-Id: I84f8e44f1142d3b43e2c12e4c926fe1f4dd3400a