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

Change-Id: I72ae55ae5287d138442f7a82ed2622ed08768d71