[automerger skipped] Merge "Update cache key calculation for statusbar insets"...

[automerger skipped] Merge "Update cache key calculation for statusbar insets" into tm-qpr-dev am: 2a024271 am: 8922c97a -s ours

am skip reason: Merged-In Ibd8575529b031747a802b56db3eb12069b9ba6b0 with SHA-1 aff24f9a is already in history

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



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