Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into sc-v2-dev