Merge "Rename public OTA policy APIs in DevicePolicyManager"