[automerger skipped] Merge "Check for invalid device attestation parameters" am: 5d08573baa am: 9dc6ec07ad -s ours am: 03fb7d4e35 -s ours
am skip reason: Merged-In I4eeec8367ebdfad527395206ab9e89b409e02631 with SHA-1 c0133d7c47 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1730396
Change-Id: I1a1412b8a9f00e8e37e0214d404a61dc75302560
This commit is contained in: