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: I4e0c7a749b1e2da0a8dd6b45dd95402c121e6b01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>