Merge "Add unit test for ScreenDecorations" into tm-qpr-dev am: d1f5758e79 am: 8ac010caec

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

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