Merge "Remove getDefaultSim hidden api" am: 8e4b2c94a8 am: 4e802a7768
am: 79421aaac2

Change-Id: I16e83cd73dfa0c6bbb87c9942b5c4f98bb497523