Merge "Try to mitigate issue #31016187: system_server crash in ArraySet." into nyc-dev
am: 184edd6d93

Change-Id: If28d6368a58a6d113e13a0f5b1a4f43d4f4a3d2d