Merge "rootcanal: correctly handle error conditions in test command add_phy."...

Merge "rootcanal: correctly handle error conditions in test command add_phy." am: 811fd27c am: baa7e5ac am: 7d21cd63

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



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