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

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

Change-Id: Ia1ceaa34fdbcf2d20690e1cc447321bdf3b40856