Merge changes I069e633f,I8cac77d6 into main am: ded9bda995 am: 9d656f46df

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

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