Merge "Don't re-wrap DeviceIdAttestationExceptions" am: 27bc799e7e

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

Change-Id: Iee544cafa0cba275bb151cd99b431af00389ffb6