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

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

Change-Id: I4f8eb3e69d4da38bb078228ee89b93726b191404