Merge changes I0317ff4d,I3bfa3749,Ica6a955e into sc-v2-dev am: 8889a5da35 am: abc667831b

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

Change-Id: I87a2861cbd24e93ad914133f654e99761eb39e5a