Merge "[Settings] Cannot use UnsupportedAppUsage API, use #hasIccCard() to replace" am: 814b7c40cb am: 23fab9be21

Change-Id: I7fa1fa40e29f0eccdc05fff69ef4b0c17da3b3e1