Merge "Fixing up DeviceInfo formatting and tests." into sc-dev am: f5926b3ec5

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/RemoteProvisioner/+/14735898

Change-Id: I20fc73de4ee289b4d30813aa5e924fc8634cf2e6