[automerger skipped] Merge "Replace Rlog with Log in CarrierDefaultApp" am: 2cbb5a9f2d am: 56b33d2e93 am: 8ea0b11e0e
am: a0cacabe21 -s ours
am skip reason: change_id Ib7ba43701b1a22ada0d8f5954c57b96bfa9f0489 with SHA1 bce5f0dee3 is in history

Change-Id: Iaa2985fbfe4dcc5d6e1c20a6000b326a2290ec8d