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

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

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