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

Change-Id: I4bc69cc57aead92c2fbd9df6ba7e7801e5923f34