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