Merge changes I2ba487b6,I398a9bf9 into main am: 5714afd531 am: f733f5232d

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

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