Merge branch 'fix_for_launch_url_when_app_is_closed' of https://github.com/one-signal/OneSignal-Android-SDK into fix_for_launch_url_when_app_is_closed

# Conflicts:
#	OneSignalSDK/app/src/test/java/com/test/onesignal/MainOneSignalClassRunner.java

Author: jkasten2