Merge "camera_proxy: Remove @hide NFC API usage" into main am: 4c8c31ae0f am: 0707f8856f am: e6d3113f66

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

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