Merge pull request #12109 from JosJuice/android-adddevice-null ControllerInterface/Android: Add null check to AddDevice
