Merge "Add USE_ATTESTATION_VERIFICATION_SERVICE permission to shell for GTS...

Merge "Add USE_ATTESTATION_VERIFICATION_SERVICE permission to shell for GTS test" into udc-dev am: 30d70c98 am: b83632d3

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



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