Merge "Add NFC TagIntentAppPreference System API" am: ab5d84cf41

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

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