Merge "Don\'t enable reader mode when NFC is disabled." into mnc-dr-dev
am: 4aa62e3910

* commit '4aa62e3910cf5c3138fff937d5198946c01eccfc':
  Don't enable reader mode when NFC is disabled.