Merge "Fix signature test issue caused by https://r.android.com/1613103" into sc-dev am: 26551da35a am: 7b3edbb2a2

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

Change-Id: I978e0f98d9d23bda3f38c5ebdc896f7400be80d1