Merge "Carrier Priviliged Apps Can't Use Security Reasons" am: 1495e21484 am: 6f0dfba61c am: ed121bfd37

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2240588

Change-Id: Ib5c877d1ea86633bf21a4041d2cad244a49b9428
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>