Merge "Remove getDefaultSim hidden api"
am: 8e4b2c94a8

Change-Id: I78fb5def73b088ac4b931e5610764a97a444dd47