Revert "fix exit for CMAccount setup"

This reverts commit a6c4c70beccfb6c71313d3e5a5d450c4db9901f9.
Revert "update AndroidManifest"

This reverts commit 617a32b7f58cd542ac7b80979b4584324c25d5d7.