Merge "Hide empty shade view on transition to KG" into tm-dev am: 18c2cb18 am: 610c33f3 am: c56b8fde am: 67a37e56

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



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