Revert "Update sample with latest changes from Android SDK"

This reverts commit eb011bd878552dc634eeb73259268a2a39fa5fa9.
Revert "Revert "Update sample with latest changes from Android SDK""

This reverts commit 80244a9d4378fa597417c75658206cc3522093e9.