Merge "Implementation of Dedicated card mode APIs changes (Discovery tech and Change Routing)" into main am: eed159fcf1

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

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