[automerger skipped] Merge "Use DISPLAY_CATEGORY_ALL_INCLUDING_DISABLED for...

[automerger skipped] Merge "Use DISPLAY_CATEGORY_ALL_INCLUDING_DISABLED for getDisplays" into tm-dev am: 1965e130 am: 8e056589 -s ours

am skip reason: skipped by user alexchau

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



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