[automerger skipped] Merge "Use com.android.telephony.Rlog for mainline module." am: b2030a4613 am: ce92504a0c am: 257092e06d -s ours
am skip reason: Change-Id I3eba2090460ded080166bbac9950fd8c8ed260ad with SHA-1 ebdba86053 is in history

Change-Id: I98523bbd5544f70dd201c1d494890c4aaa3a2755