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

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

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