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

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

Change-Id: Idd38f7468e654e545eaca4abab93c89017da1679