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

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



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