Merge pull request #6270 from mahdihijazi/suppport_restore_state [Android] Support restore emulator state
