[Android] Minor bug fix
[Android] Minor bug fix
[DemoApp][Android] Code refactoring
[DemoApp][Android] Code refactoring
[DemoApp][Android] Added Settings activity