Merge "Merge "Revert "Omit DISPLAY_DECORATION layers from CachedSets"" into...

Merge "Merge "Revert "Omit DISPLAY_DECORATION layers from CachedSets"" into tm-dev am: 6d590fe0 am: 3d0d5315" into tm-d1-dev-plus-aosp am: 75aebc24 am: 1617a88f

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



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