Merge "More canonicalization checks and canonicalize before signing" am: cf02e97946 am: 8daddefc18

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

Change-Id: I077bddf029ce6a5d2a6532575f6d3e798cc831bc