Merge "Remove decoration layers from hierarchy on release" into tm-qpr-dev am: 2d4204a3

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



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