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: I9e9e0bbe687046ef8e1c739f7b5c421628a1e15b