Try to mitigate issue #31016187: system_server crash in ArraySet.
am: dd28b7b5f3

Change-Id: I5526e96aa56d3a845f4989f08d30fd07d7a1d70b