Merge "Use com.android.telephony.Rlog for mainline module." am: b2030a4613 am: ce92504a0c

Change-Id: I50c1486e93360819efc19e55e73cb860cdd86e88