[automerger skipped] Merge "Use com.android.telephony.Rlog for mainline module." am: 20806793ce am: 93ef7203eb am: d991c7d434 -s ours
am skip reason: Change-Id Ifd7cbd6b65880bb6564c37c44de6d4adfe96c61d with SHA-1 134e027df4 is in history

Change-Id: Ib7e85800c864c589537913873e780f42c6442531