Merge "Revert "Installd: restorecon mislabeled gsf"" into sc-dev