[automerger skipped] Merge "Split robust caching flag into client and server"...

[automerger skipped] Merge "Split robust caching flag into client and server" into tm-dev-plus-aosp am: e88b783f -s ours am: cf57ba5e -s ours am: 96e73aa2 -s ours

am skip reason: Merged-In I7282b163a49d2a4d07b39dd5a99016eb01ab92b4 with SHA-1 93dee025 is already in history

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



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