[automerger skipped] Merge "Repoint ACTION_SECRET_CODE + ACTION_SIM_STATE_CHANGED" am: 7ef5614e am: 382ac6e4 -s ours am: 020efc05 -s ours am: ae2fc32a -s ours

am skip reason: Change-Id I9404e2c3c816311c7ef3875622fe5cd5a315ec58 with SHA-1 721467c6 is in history

Change-Id: Iaab72c195d5555d3124b52a15f23348361860f68