Merge "Only synchronize on NfcService and not NfcAdapterService for vendor specfic commands to avoid deadlocks." into main am: 72883fa7a2 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Nfc/+/3427459 Change-Id: I599ea8862f0023f1cc9ba09c131c042149cb685d Signed-off-by: Automerger Merge Worker <[email protected]>