tree 4282dba3e8f6bd65792a787c723172ed5211b305
parent f11e3684566cbccdd7b7492559a542c795f2b09b
parent af7af2de985cad5bde909d40ba2588caee26c442
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1701384833 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1701384833 +0000

Merge "Merge "camera_proxy: Remove @hide NFC API usage" into main am: 4c8c31ae0f am: 1ab43bf015" into udc-qpr-dev-plus-aosp am: af7af2de98

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>