[automerger skipped] Merge 10952656 am: c9ab0c34e5 -s ours am: 9c85445d1f -s ours

am skip reason: Merged-In Ia7713c539398d7d8ffbc7dfa532228e6f26e28fc with SHA-1 1e83d9c49b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/barbet/+/25090850

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