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

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



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