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

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

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



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