[automerger skipped] Split robust caching flag into client and server am:...

[automerger skipped] Split robust caching flag into client and server am: 1af3a37e am: 04e0cb57 -s ours am: 5289063a -s ours

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

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



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