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

Change-Id: Iece94ee20f7d34094d9781916523205d7e459ecf