[automerger skipped] Merge "Merge "Fix up _CheckSecondTokenNotSlotSuffixed...

[automerger skipped] Merge "Merge "Fix up _CheckSecondTokenNotSlotSuffixed function." into rvc-dev am: 2206bb29" into rvc-dev-plus-aosp am: e1b8dc59 -s ours am: 7eb9f789 -s ours

am skip reason: Change-Id Ifb3886396fe65dcdaeba16c568419b9fa084193d with SHA-1 6924eb7d is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12051901

Change-Id: Icc4346c809bcf1dd59d72a7c3b84a5e442aee7d9