Merge "Clear cached override frame when window removed" into tm-qpr-dev am: f58e5c1683 am: 55d205a717

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

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