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

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

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