Merge changes from topic "wdecor-split-changes" into udc-qpr-dev am: 1d0ac15d

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



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