Merge changes I24be3859,I53d64db0,Ic426d55f into sc-dev am: f8f6d4af06

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

Change-Id: I7c27aef8a9ec1681b20bf3384aa6c10ca32612af