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

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