[automerger skipped] Split robust caching flag into client and server am: a5007fa5 -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: I7148769d6c0cbffc2143e35478f66e614eb0388b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>