Merge "Skip service discovery if robust caching is unavailable" am: 5ab17649 am: 2e9236f1

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2495789



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