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

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



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