Merge "Add a null check before accessing int[] parameter in ModemActivityInfo" into mm-wireless-dev