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

Change-Id: I089db772e37b7d07a5423793aced78f2b3a9a1ae