Merge "Hide empty shade view on transition to KG" into tm-dev am: 18c2cb18

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



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