[automerger skipped] Merge "[Settings] Cannot use UnsupportedAppUsage API, use #hasIccCard() to replace" am: 814b7c40cb
am: 23fab9be21
am: 139c108a03
-s ours
am skip reason: Change-Id I8b948d1d416e1eb79e34be073b8ad81645d5ebb1 with SHA-1 73038f556d
is in history
Change-Id: I621b637776584d1c51e9794d7b3d8a44d887c2b2
This commit is contained in: