am 35b81ec6: (-s ours) am 25f2c6ca: Merge "Quit SimChangeReceiver if not primary user." into mnc-dev

* commit '35b81ec6c6e26622d32a268e07ff08877a0d8698':