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

[automerger skipped] DO NOT MERGE Adding tests for updated EmptyShadeView logic am: e6fe1a0e -s ours am: bb6ec7f7 -s ours am: fca2f36f -s ours am: 2d991503 -s ours am: d8e135fb -s ours

am skip reason: subject contains skip directive

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



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