Merge "More canonicalization checks and canonicalize before signing" am: cf02e97946 am: 8daddefc18 am: 59624afdce am: c8d296af83 am: b28fc6af9c

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

Change-Id: I14350c17079cdb480559e89ace7ab01ee22f8f3f