Merge "Changes in SELinux Policy for smartspace API"