[automerger skipped] Merge "DO NOT MERGE Adding tests for updated EmptyShadeView logic" into tm-qpr-dev am: ab7941d8a2 -s ours am: 095a009776 -s ours am: 2aba84befe -s ours am: bb445a28eb -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>
This commit is contained in: