Merge "Add NFC TagIntentAppPreference System API" am: ab5d84cf41 am: 86eb2a4411

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

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