[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 am: 403992c6 -s ours am: 3a6658ed -s ours

am skip reason: subject contains skip directive

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



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