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