Merge "Removing unnecessary device sumaltion code" into tm-qpr-dev am: 08a13d6a am: e2d73bf5

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



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