Merge "Update cache key calculation for statusbar insets" into tm-dev am:...

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

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



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