Merge "Add a blacklist for preinstalled carrier apps." into qt-dev
am: aa3689c4d9

Change-Id: I4a9898f5a205b7ff13ef8631870cbe3f8451923b