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

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

Change-Id: Iddf4195e0cb900e71f665086d8f09d717f5092d1