Merge "Remove the NFC_DEP count from NumDiscNtf" into rvc-dev am: 73469c9d62 am: 884d187226

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/11822728

Change-Id: I4f5a3b92b627fecbd6b9dc2869886ff9ed8b7af2