Merge "Use com.android.telephony.Rlog for mainline module." am: 20806793ce

Change-Id: Icb6d76895629dca4e24109d25df92adbb37673f4