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 am: 4f15c9d9

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



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