[automerger skipped] Merge "Fix ambiguous reference on...

[automerger skipped] Merge "Fix ambiguous reference on ComplicationViewModelTransformerTest" into main am: 91fb4f74 am: 4ecab603 -s ours

am skip reason: Merged-In If12ce8b219143e6642a988bc3f1611412d420e5a with SHA-1 472a4f23 is already in history

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



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