[automerger skipped] Merge "Merge "Add a blacklist for preinstalled carrier apps." into qt-dev am: aa3689c4 am: 386126a4 am: f9dc7e85" into qt-qpr1-dev-plus-aosp
am: 5f85c1fe -s ours
am skip reason: change_id I0afec28f1f18227947c1fe9e6bb5fd0dad3b5dac with SHA1 e0167818 is in history

Change-Id: I2b912a3cab74e5ea224290c48a64ed8b11b56545