[automerger skipped] Merge "Add USE_ATTESTATION_VERIFICATION_SERVICE...

[automerger skipped] Merge "Add USE_ATTESTATION_VERIFICATION_SERVICE permission to shell for GTS test" into udc-dev am: 30d70c98 am: 66de74d1 -s ours

am skip reason: Merged-In I18d2f77291d0b6ae7f12acecb5b786c9d3657abf with SHA-1 676e1692 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22759014



Change-Id: Ieeefc756006d2086e93bb890581fe17edc1a7081
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>