[automerger skipped] Merge "Fix violation in DecorContext" into tm-qpr-dev am:...

[automerger skipped] Merge "Fix violation in DecorContext" into tm-qpr-dev am: 4cce97fd am: fac95c24 -s ours

am skip reason: Merged-In Ie2659fb31248ad64099018bfebb6a6b43c72f466 with SHA-1 1779ab1e is already in history

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



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