Merge "Revert "Fix stale View tracking in ShadeViewDiffer"" into tm-dev am: 06f855f0

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



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