Merge "Merge "Remove API getDefaultSimCountryIso() as per API council feedback" into rvc-dev am: dd3768ed am: dd8485a8" into rvc-d1-dev-plus-aosp