[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: 029fa12c -s ours am: 5f685063 -s ours am: e1d3788c -s ours

am skip reason: Merged-In I18d2f77291d0b6ae7f12acecb5b786c9d3657abf with SHA-1 0ec14fad is already in history

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



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