Merge "Fix b/300640506" into main am: aa683c3fa8

Original change: https://android-review.googlesource.com/c/platform/development/+/2754745

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