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

Change-Id: Ie42c7a8e6a517e174a556963490f3c31f43f862a