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: 3d0d5315

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



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