[automerger skipped] Merge "Also remove entry during delete in addition to clear" into sc-dev am: 77f7385b -s ours

am skip reason: Merged-In I17a1a8b1ba2b305527ae74bb8ad5f6e1258e870e with SHA-1 c5a79ea2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/15413946

Change-Id: I5a8568633ff058693fc8eb5ed069c9ece1af618e