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

Change-Id: I42233960cd715d506fc899f845ba7818a56e6886