[automerger skipped] Merge changes I3158a1da,I43dadb7d into 24D1-dev am: 10c1a6d6 -s ours

am skip reason: Merged-In I3158a1da29ec58c5412401b67a6905c31bb120b1 with SHA-1 1c231f32 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27388030



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