Merge changes I069e633f,I8cac77d6 into main am: ded9bda9 am: 9d656f46 am:...

Merge changes I069e633f,I8cac77d6 into main am: ded9bda9 am: 9d656f46 am: c6d6027c am: 4b5fe403 am: 985ccbe4

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



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