Merge "Merge changes Ib1c28c94,Id3485a2a,If5ad5acf,Idc9054bd,Ie4e7e25d am: 756621f54d am: aae80e18c3" into sc-dev-plus-aosp am: d2674a3906

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

Change-Id: I61b2de49fa47a43e79bcc47dd5e01289d8381cb9