Merge "Add missing Javadoc dependency to `framework-nfc`" into main am: 88a58d122a am: 2ffaae9e06

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3296571

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