Move bean injection into their own injectBeans method that checks a boolean parameter before overwriting the beans in the activity/fragment.

Also add setter for the boolean parameter so that tests can set it it to true, set the beans to mock objects and not have them overwritten
Update android_maven_plugin to 3.8.2 so that project will build on maven 3.2.1
Merge branch '918_Allow_mock_beans' into develop
Merge branch '972_update_android_maven_plugin' into develop