[automerger skipped] Merge "Fix up _CheckSecondTokenNotSlotSuffixed function." am: 92346502ba
am: 7f28fe4e5b
-s ours am: dadc1cc5e2
-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: I7bf3e58d8108349a6b423cc03b12305051fa3d37
This commit is contained in: