Merge "Enforcing canonicalization of DeviceInfo." am: 4820b542fa am: 2b8301c90e

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

Change-Id: Ic5f285a2109b8f49cf7d1e548b21c4e672736290