Merge "Merge "Remove API getDefaultSimCountryIso() as per API council...
Merge "Merge "Remove API getDefaultSimCountryIso() as per API council feedback" into rvc-dev am: dd3768ed am: dd8485a8" into rvc-d1-dev-plus-aosp am: 8039b398
Change-Id: I4fcf9af93f146faa0a8699fe57d4da3c2470b285