[automerger skipped] Merge "Revert^2 "Add the cts-platform-version check""...

[automerger skipped] Merge "Revert^2 "Add the cts-platform-version check"" into stage-aosp-master am: 4800938d -s ours

am skip reason: Merged-In I613ac5b5014dbf4e6202e1dbd1b6a92359817cf2 with SHA-1 9c2fea67 is already in history

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

Change-Id: I2c79c45d105b818858f472625b8df80b69363191