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