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: 65409e48 am: d1ef7428 am: 5c09e079

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



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