Re-add return statements accidentally removed in aosp/2461534

Bug: 283238283
Test: atest BluetoothDeviceManagerTest
(cherry picked from https://android-review.googlesource.com/q/commit:3dfe71069dd1874536a42a9cb441ff0f8a1f1d6a)
Merged-In: I8cee8609b439762dffb97fde39ad0becc2b15c78
Change-Id: I8cee8609b439762dffb97fde39ad0becc2b15c78
1 file changed