Merge "Update cache key calculation for statusbar insets" into tm-qpr-dev am: 2a024271

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



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