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

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

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