Merge "Enable insets cache for display switch" into udc-dev am: cbfe13a3dd am: 2aa6c5e56e am: cc5c231b92

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

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