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 am: 541a83bc
Change-Id: I42dd6df2b1cdeeddb6b248105e77ec80de49ae91