Merge changes from topic "MMM2022_test_2024a_and_test" into 24D1-dev am: 90181ab30a

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/pixel/+/27112888

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