am b3b66af2: Merge "Move nfc-extras tests into frameworks/base/nfc-extras/tests." into ics-mr1

* commit 'b3b66af2b5b4ccca1f507290ab6f138a3cbffc3e':
  Move nfc-extras tests into frameworks/base/nfc-extras/tests.