[automerger] Split radio and sap test modules am: 7468fdf605  -s ours am: fce42f493b

Change-Id: Icc6ed75f40a119b6177e3477b69ca4ebcac9ca39