Merge "Revert "Omit DISPLAY_DECORATION layers from CachedSets"" into tm-dev...

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

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



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