[automerger skipped] Merge "DO NOT MERGE Hide EmptyShadeView when on bouncer" into tm-qpr-dev am: 80b0850938 am: 6cda65de4e -s ours am: 0b34d1ac57 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22915981 Change-Id: I8495fac438836923351a09dd991a37c7f6a0f48d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: