Merge "Merge "camera_proxy: Remove @hide NFC API usage" into main am: 4c8c31ae am: 1ab43bf0" into udc-qpr-dev-plus-aosp am: af7af2de

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



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