Merge "Remove getDefaultSim hidden api" am: fdf4dd7928
am: 083986303a

Change-Id: Ib638d1a7002e24f53150c505aee359cf062ddfdd