Merge "Hide EmptyShadeView during OCCLUDED->AOD transition" into udc-qpr-dev am: 592c04ab32

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

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