Merge "Update cache key calculation for statusbar insets" into tm-dev am: 0547aacf am: 103dfab7

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



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