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

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

Change-Id: I1579db009de143e0389fec5f8607d9c6ea088969