[automerger skipped] Merge "Use com.android.telephony.Rlog for mainline...
[automerger skipped] Merge "Use com.android.telephony.Rlog for mainline module." am: b0f00c60 -s ours am: 727e766d -s ours
am skip reason: Change-Id I23ec4cb2c343490ef2d45cad3baf2e7ad6f89301 with SHA-1 aeb88736 is in history
Change-Id: Ia7d36c39305a43400ed5b3e92197c75d5f61e996