[automerger skipped] Merge "DO NOT MERGE Adding tests for updated...

[automerger skipped] Merge "DO NOT MERGE Adding tests for updated EmptyShadeView logic" into tm-qpr-dev am: ab7941d8 -s ours am: 095a0097 -s ours am: 2aba84be -s ours am: bb445a28 -s ours

am skip reason: subject contains skip directive

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



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