[automerger skipped] Merge "Implementation of Dedicated card mode APIs changes (Discovery tech and Change Routing)" into main am: eed159fcf1 am: b17d3b918c am: 461c22fc15 -s ours

am skip reason: Merged-In If664910d00fc673c0329e0cd4489174260eb4f1e with SHA-1 a0de319f68 is already in history

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

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