Merge cherrypicks of [18122622, 20123803] into sc-v2-platform-release. am: a57ba775f4

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

Change-Id: I51fef0265b83b07825c0f19f02db2e9508a2b334
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>