Merge SP1A.211105.004 to aosp-master - DO NOT MERGE

Merged-In: If6bec622f8a151011d81d0c0b158892a91be365d
Merged-In: Ia0a860b5945c952ab830254d1f5fb12944f3d10a
Change-Id: Ie3bcacaaa7dd8641450623ef245a7712c45d4b17

parents 3e5de5b6 0417872b

AndroidManifest.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -495,6 +495,7 @@

		<activity
		android:name=".vcard.NfcImportVCardActivity"
		android:permission="android.permission.DISPATCH_NFC_MESSAGE"
		android:configChanges="orientation\|screenSize\|keyboardHidden"
		android:exported="true"
		android:theme="@style/BackgroundOnlyTheme">