Merge "Revert "Add STS exeptions to ValidateTestsAbi"" am: 6fc7d47ce4 am: 4f9f2eb64d am: b9f37655c7

Original change: https://android-review.googlesource.com/c/platform/cts/+/1551377

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie142e00d3567c3079ec3dc191991fca39b528e74