Merge "Fix for UnnecessaryStubbingException in JUnit test failures" am: 5e249b7781 am: f349a1d5c6 am: 95d08993cd am: 05d3209abb am: 56b097644d am: be8049ca70

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

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