Merge "CarrierDefaultApp remove debuggable=true"