[automerger skipped] HapClientService: Don't use cache for PTS am: 08852175...

[automerger skipped] HapClientService: Don't use cache for PTS am: 08852175 -s ours am: f3a9c839 -s ours

am skip reason: Merged-In I14f8eda50321f941b69fa1cd37403b131dc5938d with SHA-1 b9dac8a5 is already in history

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



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