Merge "Moving some utility tests to instrumentation tests" into sc-v2-dev am: c799b9d239 am: 8e8f5020de

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

Change-Id: I0bc14ea91b16adb33dfbbcdea4256765d2c1f0ac