[automerger skipped] Merge "Revert "Add a blacklist for preinstalled carrier...

[automerger skipped] Merge "Revert "Add a blacklist for preinstalled carrier apps."" into rvc-dev am: ddb640a8 am: b467333c am: 5b5170a3 -s ours am: 49432388 -s ours

am skip reason: Change-Id I5d07bd7ce4bde11a287f44ad2ff97370d4c30db6 with SHA-1 c4b36e9d is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11809242

Change-Id: I55245ea2eaa8658f3a54794f65bfbd35ceb5e38f