[automerger skipped] Merge "Merge "Revert "Refactor Utilities#isTablet to...

[automerger skipped] Merge "Merge "Revert "Refactor Utilities#isTablet to Utilities#isLargeScreen"" into tm-qpr-dev am: 1a8ac237 am: fdfb5d13" into udc-dev am: d681c7a7 -s ours

am skip reason: Merged-In I9ab45d65e08a6024729819724e8661e00419ebdd with SHA-1 78a44f21 is already in history. Merged-In was found from reverted change.

Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21508490

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21559004



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