Merge "Try to mitigate issue #31016187: system_server crash in ArraySet." into nyc-dev am: 184edd6d93 am: 90a6799951
am: 22ad9a3116
Change-Id: If77340cf08148afaf8ad61ae5e0bef299948958e
This commit is contained in: