Merge "Fix crash for DefaultSubscriptionController" into tm-dev am: fa878f2f...

Merge "Fix crash for DefaultSubscriptionController" into tm-dev am: fa878f2f am: 1c432c5a am: c9f528ee

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18573290



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