Merge "Revert^2 "Fix stale View tracking in ShadeViewDiffer"" into tm-dev am: f24ff65a

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



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