Converted the android version to use the new features.
Tested using Android 6.0 and 5.1.1.
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Tested using Android 6.0 and 5.1.1.