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

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



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