Switch to using new method: AndroidTools.registerReceiver in SdlRouterService and ServiceFinder

Author: JulianKast

android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java

@@ -1210,11 +1210,7 @@ public void startUpSequence() {
 
         IntentFilter filter = new IntentFilter();
         filter.addAction(REGISTER_WITH_ROUTER_ACTION);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-            registerReceiver(mainServiceReceiver, filter, RECEIVER_EXPORTED);
-        } else {
-            registerReceiver(mainServiceReceiver, filter);
-        }
+        AndroidTools.registerReceiver(this, mainServiceReceiver, filter, RECEIVER_EXPORTED);
 
         if (!connectAsClient) {
             if (bluetoothAvailable()) {

android/sdl_android/src/main/java/com/smartdevicelink/util/ServiceFinder.java

@@ -75,11 +75,8 @@ public ServiceFinder(Context context, String packageName, final ServiceFinderCal
 
         this.sdlMultiMap = AndroidTools.getSdlEnabledApps(context, packageName);
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-            this.context.registerReceiver(mainServiceReceiver, new IntentFilter(this.receiverLocation), Context.RECEIVER_EXPORTED);
-        } else {
-            this.context.registerReceiver(mainServiceReceiver, new IntentFilter(this.receiverLocation));
-        }
+        AndroidTools.registerReceiver(this.context, mainServiceReceiver,
+                new IntentFilter(this.receiverLocation), Context.RECEIVER_EXPORTED);
 
         timeoutRunnable = new Runnable() {
             @Override