Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference"
am: 44360bc96a

Change-Id: I6975c5213f74d4b9df343cae82d93f654774d1c3