Merge "Enable insets cache for display switch" into udc-dev am: cbfe13a3dd am: aad3af45d4

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

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