[automerger skipped] Merge "Fix signature test issue caused by https://r.android.com/1613103" into sc-dev am: 26551da35a am: 7b3edbb2a2 am: 0952105f8f -s ours am: b6bfcf860b -s ours

am skip reason: Merged-In Ib9d1fcb62655534998aeb64e1c31f277e4ef9ed0 with SHA-1 90d8751403 is already in history

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

Change-Id: I6af341fd604b235699b10eb12195983f3069d332