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

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

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