Merge "Replace Rlog with Log in CarrierDefaultApp" am: 2cbb5a9f2d am: 56b33d2e93
am: 8ea0b11e0e

Change-Id: I96ea521c0aa90c4ee57584b2b211be739f4e5b60