am e1f522ad: am 028b6b3f: Merge "Don\'t show tap&pay if NFC is off." into klp-dev

* commit 'e1f522ad4bac2d39bcaddf60a91256e15d9ab942':
  Don't show tap&pay if NFC is off.