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

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

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