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

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

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