Try to mitigate issue #31016187: system_server crash in ArraySet. am: dd28b7b5f3 am: 05775d71e6
am: 2eb6e503ea
Change-Id: I76ecb94f695405dd9938680cdb31a86b8d3411a2
This commit is contained in: