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

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

Change-Id: I3e57c032863231bcdb8171457a550a42c0edc898