Merge "Remove ShadeViewRefactor annotation and uses" into udc-dev am: cd142ed8 am: a0154a45

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



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