ASABASE-316 Updating Sample Apps

Reverting these two files to keep AdvertiseName and CancelAdvertiseName
since the onbaording deamon acts as a service and needs to be backwards
compliant

Change-Id: I1d529746500548e4477f5b81ec84a2504241429e
Signed-off-by: rlancer <rlancer@qce.qualcomm.com>