tree ed47220302ee61ef3b4aa5779174bea0c43e4362
parent 6a7b8d724329291f3c362e4a88f3e262ef7cfb87
parent b69a4ed2bb223d4b40b1b217495c0c00845e20ce
author Roshan Pius <rpius@google.com> 1725583978 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1725583978 +0000

[automerger skipped] [conflict] Merge "shell(nfc): Add NFC_SET_CONTROLLER_ALWAYS_ON for NFC testing" into main am: 03c81cdc75 am: b69a4ed2bb -s ours

am skip reason: Merged-In Id0233a614491173d48f6111fd0ef4bd9ce50d4a9 with SHA-1 b970a30c7c is already in history

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

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