[automerger skipped] Merge "SystemUI: res array for statusbar blocked icons"...

[automerger skipped] Merge "SystemUI: res array for statusbar blocked icons" into sc-v2-dev-plus-aosp am: 30410dee -s ours

am skip reason: Merged-In I9a04a67a9c0914989d34c8c53ceee97788e7ba6c with SHA-1 1ae9c8d8 is already in history

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

Change-Id: I0f52af40a08773140cbcd8788ce69081abb394f8