Merge "Split robust caching flag into client and server" into tm-d1-dev am:...

Merge "Split robust caching flag into client and server" into tm-d1-dev am: 999f0ec1 am: 3f53d146 am: 991b1e62

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



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