Merge "Parse extras bundles from NFC tags" into tm-dev am: 866cd169 am: f5fb5e23 am: 08d9882b

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



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