Merge "Fix NullPointerException when telephony does not return ModemActivityInfo" into main