Merge "Fix test and DeviceProfile dump" into tm-qpr-dev am: b0ed7dae63 am: 1635e321bb

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

Change-Id: Idb4eb8fe27b3f86d3d9229f9fd9d7f313cc95748
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>