Merge "[Unfold transition] Use DISPLAY_CATEGORY_ALL_INCLUDING_DISABLED for the overlay" into tm-qpr-dev am: 3599c203fb

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

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