Merge branch 'refs/heads/sdl_android_parent/hotfix' into sdl_android_parent/master
Merge branch 'refs/heads/sdl_android_parent/develop' into sdl_android_parent/master
Merge branch 'refs/heads/sdl_android_parent/hotfix' into sdl_android_parent/master

Signed-off-by: Mike Burke <mike@livioconnect.com>

Conflicts:
	sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ChangeRegistrationResponse.java
Changes in getLockScreenStatus Method for Checking Null Pointer

Signed-off-by: Mike Burke <mike@livioconnect.com>
BugFix changes : getImageTypeSupported needs to return array, Proper Instance checking in getInteractionLayout and getKeyboardProperties
Added additional parameters to putFileStream.
Additional Changes in setImageTypeSupported() method to take input as List of FileType. Also, removed unnecessary import in PerformInteraction.java to prevent additional warning.
Merge branch 'refs/heads/anildahiya/AddedPutFileStreamParam' into sdl_android_parent/develop
Merge branch 'refs/heads/anildahiya/BugFix_KeyBoardProperty_ImageTypeSupported' into sdl_android_parent/develop