Merge "Fix ApexSignatureVerificationTest" am: cf457f9040 am: 0810cb1856

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

Change-Id: I3a945459f5123bd9c6b2f827b584cb0b4df064b7