Merge "Not using calculator from test" into tm-qpr-dev am: adf526ab am: 522f51f3

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



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