Merge "Parse extras bundles from NFC tags" into tm-dev am: 866cd169 am: c2ad7988 am: 7f944e36

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188208



Change-Id: I54e9564946bfc8b65eeb690e60add8309a21832c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>