[automerger skipped] Merge "Fix java.lang.ArrayIndexOutOfBoundsException in...

[automerger skipped] Merge "Fix java.lang.ArrayIndexOutOfBoundsException in RemoteVolumeGroupController" into rvc-qpr-dev am: de2f2754 am: 32ef3166 -s ours

am skip reason: Change-Id Ibfc11e1bd99ba2e578b5d9e7dcc9132e372b68dd with SHA-1 1268629f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13136219

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d9bf7bb9ad136975ec302c751cdf792311893f3