Merge "[Settings] Do not show SIM if not supported" into tm-qpr-dev am: ff959fb6 am: 272d5232

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



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