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: 055b141d

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



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