Merge "More canonicalization checks and canonicalize before signing" am:...

Merge "More canonicalization checks and canonicalize before signing" am: cf02e979 am: 8daddefc am: 59624afd am: c8d296af

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2029343

Change-Id: Ic6cdc2bf37fd8948cc0895bb9051bd5ce395ab02