Merge "Include CarrierDefaultApp to the img"
am: 5e6ce5f504

Change-Id: Ibe79b9b961f6a04535e2f34e3da2ef1e3367a9d9