Merge "Guard against exception from TelephonyManager.getMeid()" into main