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

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

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



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