[automerger skipped] Use com.android.telephony.Rlog for mainline module. am:...
[automerger skipped] Use com.android.telephony.Rlog for mainline module. am: aeb88736 -s ours am: 6ca95616 -s ours
am skip reason: Change-Id I23ec4cb2c343490ef2d45cad3baf2e7ad6f89301 with SHA-1 40307d60 is in history
Change-Id: If3c6844458752ef10649b3c67bbcdbc42120a604