[automerger skipped] Merge "Add a blacklist for preinstalled carrier apps." into qt-dev am: aa3689c4d9 am: 60cc649995 -s ours
am: c2f30648c3 -s ours
am skip reason: change_id I0afec28f1f18227947c1fe9e6bb5fd0dad3b5dac with SHA1 e016781807 is in history

Change-Id: I7c0e4f825093dc0db2e07d16ff78bcbd5780cdd4