Merge "Revert "Omit DISPLAY_DECORATION layers from CachedSets"" into tm-dev am: 6d590fe039

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

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