Merge changes from topic "testDelegatedCertInstallerDeviceIdAttestation" into sc-v2-dev-plus-aosp am: 6cbad8cff9

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

Change-Id: I57b942c413552622d015fd84f1d73157513b4731