Revert^2 "Remove old Factory OTA sepolicy setting for C2/F2" ec8b18aba517ab5e9f5a4eab79917a02d53c2932 Change-Id: I15ad19ce1b5a85617296c06a28beaf4e97486d78