partial commit of 15a48e91073bdb30a70f6913c74100f1f3947636, only takes RIL/phone related

Change-Id: I319253f8c7d5266ac01d589eb3982f4559bbaee7