Merge "API fixup isOffloadedTransportDiscoveryDataScanSupported" am: 469ca96a94 am: 5af4200264 am: a727c17fa8

Original change: https://android-review.googlesource.com/c/platform/cts/+/2473190

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