Merge "Temporarily revert the SELinux policy for persist.netd.stable_secret."