Merge "Add STS exeptions to ValidateTestsAbi#testBinariesAbis" am: 44cf873500 am: ae1a2ea72d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib2307dbbad7615eecd7f54e7044c8cd6028fbaf8