Merge "Add ALL_INCLUDING_DISPLAYS category for getDisplays()" into tm-dev am: d5b0c3f163 am: c8571df946 am: 88c59ce930
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18488313 Change-Id: I4137a531b9f2ca8edd1a9d58fa8b07b0028b58f5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: