Merge "Turn off privilege fallback when using test privilege rules." am: 5efb37e049 am: 60dba8adda

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

Change-Id: I6accee09ac5fad5b0bb24bd37b800b81a50d8b76