Merge "Hide empty shade view on transition to KG" into tm-dev am: 18c2cb18 am: 610c33f3 am: 8a360513 am: 49d4c0aa

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



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