am a2fe3652: Merge "Remove NFC handling from AbstractMailActivity" into jb-ub-mail-ur8

* commit 'a2fe36524217e91dbb1590ae4655e0bc37f84f55':
  Remove NFC handling from AbstractMailActivity