Merge "gd/shim: Cleanup dead code in dumpsys implementation" into main am:...

Merge "gd/shim: Cleanup dead code in dumpsys implementation" into main am: dc177ea9 am: a6794f9c

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



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