Merge "Handle unsupported operations in the time consuming pref activity." into tm-dev am: e65639ded3 am: 9b0e0d7a76

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

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