Merge "Clear mInheritedCompatDisplayInsets when clearing size compat mode" into tm-qpr-dev am: 451856db am: 3f867c81 am: 24d6079a am: 30e6596b

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



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