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

Change-Id: Ie4014162bb80a7acfb7096811b6bcbf9def9877b