[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 am: ab56bda5 -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: Ic3b1aa607a93ca52600dc1240c0fa2e7c042f58d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>