Merge changes I069e633f,I8cac77d6 into main am: ded9bda995

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

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