Merge "Add STS exeptions to ValidateTestsAbi" am: 79b6127636 am: ce42c7d354 am: d1b6803fbd

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1856d73adf6276612646a9277ea82d42ac4c8be0