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

[automerger skipped] Merge "Fix up _CheckSecondTokenNotSlotSuffixed function." into rvc-dev am: 2206bb29 am: 0d42f2f2 am: 6753c0eb -s ours am: 8a61f0e4 -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: I27090131589178922b4c55b7a4d373bb6c05077f