Don't merge bluez-hfp

The hands free test is known to cause some issues with timeouts when
performed as part of the bluez-phone test suite against some phones. This
is not something for which there is a priority to fix, so mitigate the
risk of these timeouts by keeping the bluez-hfp tests separate for now.

Signed-off-by: Martyn Welch <martyn.welch@collabora.com>

content/concepts/test_case_evaluation.md

@@ -64,7 +64,7 @@ analysis performed for this review along with any suggestions for change:
 | aum-power-cut					| automated     |				| Critical	| 		| Yes		| high		| low		|  		| 
 | aum-rollback-blacklist			| automated     |				| Critical	| 		| Yes		| high		| low		|  		| 
 | bluez-avrcp-volume 				| manual        | 08				| Medium	| 		|  		| low		| high		| Merge 	| We have to do all this in `apparmor-bluez-avrcp-volume`. Merge the tests.
-| bluez-hfp 					| manual        | 08				| Medium	| 		| 		| low		| high		| Merge		| Tests hands free profile, merge with `bluez-phone`.
+| bluez-hfp 					| manual        | 08				| Medium	| 		| 		| low		| high		| 		| Keep separate as merging this with `bluez-phone` has been known to cause timeout issues with some phones.
 | bluez-phone 					| manual        | 08				| Critical	| 		|  		| high		| high		| 		| Tests lots of bluetooth functionality paired with a phone.
 | bluez-setup 					| manual        | 08				| Critical	| 		|  		| low		| high		| Merge		| We have to do all this in `apparmor-bluez-setup`. Merge the tests.
 | boot-no-crashes				| automated     |				| High		| 		| Yes		| high		| low		|   		| Checks journal for auditd messages suggesting app crashes