Merge "Test: Adding Test Cases to NdefMessageTest" into main am: e0671b4559

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

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