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

Change-Id: I6509659f0ff94241ca54e908899a49d1915ee7df