[automerger skipped] Merge "Fix up _CheckSecondTokenNotSlotSuffixed function." am: 92346502ba am: 7f28fe4e5b -s ours
am skip reason: Change-Id Ifb3886396fe65dcdaeba16c568419b9fa084193d with SHA-1 6924eb7d40 is in history
Original change: https://android-review.googlesource.com/c/platform/build/+/1353435
Change-Id: I95bb74e492d4fc8df62bb87c9282354c1ae9f0ec
This commit is contained in: