Merge "avatar: use new TF rootcanal target preparer" into main am: efde2785

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



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