Merge "Add ALL_INCLUDING_DISPLAYS category for getDisplays()" into tm-dev am:...

Merge "Add ALL_INCLUDING_DISPLAYS category for getDisplays()" into tm-dev am: d5b0c3f1 am: 40935482

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



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