Add support for carrier \"associated\" apps.
am: 24b9d96007

Change-Id: I1de92977f3a0635d88e6517210f6bbb06ab3d0f0